@yorz/cli 0.6.5 → 0.7.1

package/dist/cli/index.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import { homedir, platform } from "node:os";
 import { Command, Option } from "commander";
-import { stat, mkdir, readFile, writeFile, rename, rm, access, readdir, appendFile, copyFile } from "node:fs/promises";
-import { join, isAbsolute, resolve, basename as basename$1, dirname, extname, sep, relative, normalize } from "node:path";
+import { stat, mkdir, writeFile, rename, readFile, rm, access, readdir, appendFile, copyFile } from "node:fs/promises";
+import { join, isAbsolute, resolve, basename as basename$1, dirname, extname, relative, sep, normalize } from "node:path";
 import { createHash, randomUUID, randomBytes } from "node:crypto";
 import { existsSync, openSync, closeSync, statSync, readSync, mkdirSync, watch, createReadStream } from "node:fs";
 import { spawn, execFile, execFileSync } from "node:child_process";
@@ -23,7 +23,7 @@ import { createOpencode } from "@opencode-ai/sdk";
 import { createInterface as createInterface$1 } from "node:readline/promises";
 import MarkdownIt from "markdown-it";
 const name = "@yorz/cli";
-const version = "0.6.5";
+const version = "0.7.1";
 const type = "module";
 const description = "";
 const bin = { "yorz": "./dist/cli/index.js" };
@@ -54,6 +54,93 @@ const pkg = {
   dependencies,
   devDependencies
 };
+const HIDDEN_PROMPT_OPEN = "<!-- yorz:hidden -->";
+const HIDDEN_PROMPT_CLOSE = "<!-- /yorz:hidden -->";
+const SLASH_NAME_RE$1 = /^\/([\w-]+)(?:\s|$)/;
+function matchCustomInstruction(prompt, instructions) {
+  const matched = SLASH_NAME_RE$1.exec(prompt.trim());
+  if (!matched) return null;
+  const name2 = matched[1];
+  return instructions.find((item) => item.name === name2) ?? null;
+}
+function wrapHiddenPrompt(hidden, original) {
+  const body = hidden.trim();
+  if (!body) return original;
+  return [HIDDEN_PROMPT_OPEN, body, HIDDEN_PROMPT_CLOSE, original].join("\n");
+}
+function appendHiddenPrompt(original, hidden) {
+  const body = hidden.trim();
+  if (!body) return original;
+  return [original, "", HIDDEN_PROMPT_OPEN, body, HIDDEN_PROMPT_CLOSE].join("\n");
+}
+function normalizeCustomInstructions(value) {
+  if (!Array.isArray(value)) return [];
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const item of value) {
+    if (!item || typeof item !== "object") continue;
+    const obj = item;
+    const id = typeof obj.id === "string" ? obj.id.trim() : "";
+    const name2 = typeof obj.name === "string" ? obj.name.trim().replace(/^\/+/, "") : "";
+    if (!id || !name2 || seen.has(id) || !/^[\w-]+$/.test(name2)) continue;
+    seen.add(id);
+    out.push({
+      id,
+      name: name2,
+      description: typeof obj.description === "string" ? obj.description : "",
+      // Fall back to the pre-rename `systemPrompt` so existing configs keep
+      // working; the next save rewrites them under the new key.
+      hiddenPrompt: typeof obj.hiddenPrompt === "string" ? obj.hiddenPrompt : typeof obj.systemPrompt === "string" ? obj.systemPrompt : "",
+      prefill: typeof obj.prefill === "string" ? obj.prefill : "",
+      createdAt: typeof obj.createdAt === "number" && obj.createdAt > 0 ? obj.createdAt : 0
+    });
+  }
+  return out;
+}
+function parseCustomInstructions(value) {
+  if (value === void 0) return [];
+  if (!Array.isArray(value)) return { error: "customInstructions must be an array" };
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const [index, item] of value.entries()) {
+    if (!item || typeof item !== "object") {
+      return { error: `customInstructions.${index} must be an object` };
+    }
+    const obj = item;
+    const id = typeof obj.id === "string" ? obj.id.trim() : "";
+    const name2 = typeof obj.name === "string" ? obj.name.trim().replace(/^\/+/, "") : "";
+    if (!id) return { error: `customInstructions.${index}.id required` };
+    if (!name2 || !/^[\w-]+$/.test(name2)) {
+      return {
+        error: `customInstructions.${index}.name must use letters, numbers, underscores, or hyphens`
+      };
+    }
+    if (seen.has(id)) return { error: `duplicate custom instruction id: ${id}` };
+    seen.add(id);
+    const description2 = obj.description;
+    const hiddenPrompt = obj.hiddenPrompt ?? obj.systemPrompt;
+    const prefill = obj.prefill;
+    const createdAt = obj.createdAt;
+    if (typeof description2 !== "string") {
+      return { error: `customInstructions.${index}.description must be a string` };
+    }
+    if (typeof hiddenPrompt !== "string") {
+      return { error: `customInstructions.${index}.hiddenPrompt must be a string` };
+    }
+    if (typeof prefill !== "string") {
+      return { error: `customInstructions.${index}.prefill must be a string` };
+    }
+    if (typeof createdAt !== "number" || createdAt <= 0) {
+      return { error: `customInstructions.${index}.createdAt must be a positive number` };
+    }
+    out.push({ id, name: name2, description: description2, hiddenPrompt, prefill, createdAt });
+  }
+  return out;
+}
+function mergeCustomInstructions(project, global) {
+  const names = new Set(project.map((item) => item.name));
+  return [...project, ...global.filter((item) => !names.has(item.name))];
+}
 const CURRENT_VERSION$1 = 1;
 const DEFAULT_GLOBAL_AGENT = { defaultKind: "claude" };
 const DEFAULT_NOTIFICATIONS = {
@@ -62,6 +149,11 @@ const DEFAULT_NOTIFICATIONS = {
 const DEFAULT_POWER = {
   inhibitWhenRunning: "system-default"
 };
+const DEFAULT_APPEARANCE = {
+  themeMode: "system",
+  themeName: "terminal",
+  language: "zh-CN"
+};
 const SHORTCUT_ACTION_IDS = [
   "newSpec",
   "toggleSpecDetailFullscreen",
@@ -74,6 +166,9 @@ function resolveGlobalConfigDir(env = process.env) {
   return join(base, "yorz");
 }
 function resolveGlobalConfigPath(env = process.env) {
+  return join(resolveGlobalConfigDir(env), "config.json");
+}
+function resolveLegacyGlobalProjectsPath(env = process.env) {
   return join(resolveGlobalConfigDir(env), "projects.json");
 }
 function resolveGlobalSkillsDir(env = process.env) {
@@ -84,7 +179,14 @@ function resolveSkillEntry(skillName, env = process.env) {
 }
 async function loadGlobalConfig(filePath) {
   const fp = filePath ?? resolveGlobalConfigPath();
-  if (!existsSync(fp)) return defaultGlobalConfig();
+  if (!existsSync(fp)) {
+    const legacy = filePath ? basename$1(fp) === "config.json" ? join(dirname(fp), "projects.json") : "" : resolveLegacyGlobalProjectsPath();
+    if (legacy && existsSync(legacy)) return loadGlobalConfigFromPath(legacy);
+    return defaultGlobalConfig();
+  }
+  return loadGlobalConfigFromPath(fp);
+}
+async function loadGlobalConfigFromPath(fp) {
   let raw;
   try {
     raw = await readFile(fp, "utf8");
@@ -134,7 +236,9 @@ function normalizeConfig$1(value) {
     agent: normalizeAgent$1(obj.agent),
     notifications: normalizeNotifications(obj.notifications),
     shortcuts: normalizeShortcuts(obj.shortcuts),
-    power: normalizePower(obj.power)
+    power: normalizePower(obj.power),
+    appearance: normalizeAppearance(obj.appearance),
+    customInstructions: normalizeCustomInstructions(obj.customInstructions)
   };
 }
 function defaultGlobalConfig() {
@@ -151,7 +255,9 @@ function defaultGlobalConfig() {
     shortcuts: {},
     power: {
       inhibitWhenRunning: DEFAULT_POWER.inhibitWhenRunning
-    }
+    },
+    appearance: { ...DEFAULT_APPEARANCE },
+    customInstructions: []
   };
 }
 function normalizeAgent$1(value) {
@@ -202,6 +308,27 @@ function normalizePower(value) {
   }
   return { inhibitWhenRunning: DEFAULT_POWER.inhibitWhenRunning };
 }
+function normalizeAppearance(value) {
+  if (!value || typeof value !== "object") return { ...DEFAULT_APPEARANCE };
+  const obj = value;
+  const themeMode = obj.themeMode;
+  const themeName = obj.themeName;
+  const language = obj.language;
+  return {
+    themeMode: isThemeMode(themeMode) ? themeMode : DEFAULT_APPEARANCE.themeMode,
+    themeName: isThemeName(themeName) ? themeName : DEFAULT_APPEARANCE.themeName,
+    language: isLanguage(language) ? language : DEFAULT_APPEARANCE.language
+  };
+}
+function isThemeMode(value) {
+  return value === "system" || value === "light" || value === "dark";
+}
+function isThemeName(value) {
+  return value === "terminal" || value === "graphite" || value === "paper";
+}
+function isLanguage(value) {
+  return value === "zh-CN" || value === "en";
+}
 function normalizeShortcutBinding(value) {
   const parts = value.split("+").map((part) => part.trim()).filter(Boolean);
   let key = "";
@@ -1547,18 +1674,18 @@ function isYorzDebugCommand(prompt) {
   return /^\/yorz-debug(?:\s|$)/.test(prompt.trim());
 }
 function buildChatDebugPrompt(prompt, now = /* @__PURE__ */ new Date()) {
-  const body = prompt.trim().replace(/^\/yorz-debug(?:\s+|$)/, "").trim();
+  const original = prompt.trim();
+  const body = original.replace(/^\/yorz-debug(?:\s+|$)/, "").trim();
   const debugPath = `${CHAT_DEBUG_DIR_REL}/debug-${formatDebugTimestamp(now)}.md`;
-  const bug = body || "请先根据对话上下文确认待调试问题；若上下文不足，请向用户补齐复现信息。";
-  return [
+  const guide = [
     `${skillRef("yorz-debug")}，然后进入 Debug 模式。`,
     `本次是普通 chat 独立触发，没有 spec_dir。Debug 活文档必须写入临时文件 \`${debugPath}\`。`,
     `写入前请确保目录 \`${CHAT_DEBUG_DIR_REL}/\` 存在；该目录属于临时目录，会由 YorZ 定时清理。`,
     `如果该文件不存在则创建；本文件只承载本次 chat debug 记录，不需要追加复用其他文件。`,
     "",
-    "待调试问题：",
-    bug
+    body ? "待调试问题见下方用户输入（忽略其中的 `/yorz-debug` 指令前缀）：" : "请先根据对话上下文确认待调试问题；若上下文不足，请向用户补齐复现信息。"
   ].join("\n");
+  return wrapHiddenPrompt(guide, original);
 }
 async function cleanupExpiredChatDebugFiles(projectPath, opts = {}) {
   const root = join(projectPath, CHAT_DEBUG_DIR_REL);
@@ -1607,6 +1734,169 @@ function formatDebugTimestamp(date) {
     pad(date.getSeconds())
   ].join("");
 }
+const CURRENT_VERSION = 1;
+const DEFAULT_SPECS_DIR = ".yorz/specs";
+function defaultProjectConfig() {
+  return {
+    version: CURRENT_VERSION,
+    agent: { kind: "inherit" },
+    specsDir: DEFAULT_SPECS_DIR,
+    commands: [],
+    customInstructions: []
+  };
+}
+function configPath(cwd) {
+  return join(cwd, ".yorz", "config.json");
+}
+async function loadProjectConfig(cwd) {
+  const fp = configPath(cwd);
+  if (!existsSync(fp)) return defaultProjectConfig();
+  let raw;
+  try {
+    raw = await readFile(fp, "utf8");
+  } catch {
+    return defaultProjectConfig();
+  }
+  if (!raw.trim()) return defaultProjectConfig();
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return defaultProjectConfig();
+  }
+  return normalizeConfig(parsed);
+}
+async function saveProjectConfig(cwd, cfg) {
+  const fp = configPath(cwd);
+  await mkdir(dirname(fp), { recursive: true });
+  const normalized = normalizeConfig(cfg);
+  const body = `${JSON.stringify(normalized, null, 2)}
+`;
+  const tmp = `${fp}.tmp-${process.pid}-${Date.now().toString(36)}`;
+  await writeFile(tmp, body, "utf8");
+  await rename(tmp, fp);
+}
+function resolveSpecsDir(cwd, cfg) {
+  const root = resolve(cwd);
+  const raw = (cfg.specsDir || DEFAULT_SPECS_DIR).trim() || DEFAULT_SPECS_DIR;
+  const abs = isAbsolute(raw) ? resolve(raw) : resolve(root, raw);
+  const rel = relative(root, abs);
+  if (rel === "" || rel.startsWith("..") || isAbsolute(rel)) {
+    throw new Error(`specsDir must stay within the project root: ${raw}`);
+  }
+  return abs;
+}
+async function ensureSpecsDirExists(absSpecsDir) {
+  await mkdir(absSpecsDir, { recursive: true });
+}
+function normalizeConfig(value) {
+  if (!value || typeof value !== "object") return defaultProjectConfig();
+  const obj = value;
+  const agent = normalizeAgent(obj.agent);
+  const specsDir = normalizeSpecsDir(obj.specsDir);
+  const commands = normalizeCommands(obj.commands);
+  const customInstructions = normalizeCustomInstructions(obj.customInstructions);
+  return { version: CURRENT_VERSION, agent, specsDir, commands, customInstructions };
+}
+function normalizeCommands(value) {
+  if (!Array.isArray(value)) return [];
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const item of value) {
+    if (!item || typeof item !== "object") continue;
+    const obj = item;
+    const id = typeof obj.id === "string" ? obj.id.trim() : "";
+    const name2 = typeof obj.name === "string" ? obj.name.trim() : "";
+    const cli = typeof obj.cli === "string" ? obj.cli.trim() : "";
+    if (!id || !name2 || !cli || seen.has(id)) continue;
+    seen.add(id);
+    const createdAt = typeof obj.createdAt === "number" && obj.createdAt > 0 ? obj.createdAt : 0;
+    out.push({ id, name: name2, cli, createdAt });
+  }
+  return out;
+}
+function normalizeAgent(value) {
+  if (typeof value === "string") {
+    if (value === "opencode") return { kind: "opencode" };
+    if (value === "codex") return { kind: "codex" };
+    return { kind: "claude" };
+  }
+  if (!value || typeof value !== "object") return { kind: "claude" };
+  const obj = value;
+  const kind = obj.kind;
+  if (kind === "inherit") return { kind: "inherit" };
+  if (kind === "opencode") return { kind: "opencode" };
+  if (kind === "codex") return { kind: "codex" };
+  if (kind === "custom") {
+    const cmd = typeof obj.cmd === "string" ? obj.cmd.trim() : "";
+    if (!cmd) return { kind: "claude" };
+    const args = Array.isArray(obj.args) ? obj.args.filter((a) => typeof a === "string") : [];
+    return { kind: "custom", cmd, args };
+  }
+  return { kind: "claude" };
+}
+function normalizeSpecsDir(value) {
+  if (typeof value !== "string") return DEFAULT_SPECS_DIR;
+  const trimmed = value.trim();
+  if (!trimmed) return DEFAULT_SPECS_DIR;
+  return trimmed;
+}
+const SLASH_NAME_RE = /^\/([\w-]+)(?:\s|$)/;
+const SPEC_COMMAND_RE = /^\/yorz-spec(?:\s|$)/;
+function isSlashCommand(prompt) {
+  return SLASH_NAME_RE.test(prompt.trim());
+}
+function buildChatSpecPrompt(prompt, specsDirRelative) {
+  const original = prompt.trim();
+  const body = original.replace(SPEC_COMMAND_RE, "").trim();
+  const guide = [
+    `${skillRef("yorz-spec")}，然后按其自动模式判定推进。`,
+    `本次是普通 chat 独立触发，未指定 spec_path：若当前会话上下文中已出现过 spec 文档，继续推进该 spec；否则按 skill 的「新建 spec」流程创建后立即推进 plan 阶段。`,
+    `spec 目录为 \`${specsDirRelative}/\`。`,
+    "",
+    body ? "本次需求见下方用户输入（忽略其中的 `/yorz-spec` 指令前缀）：" : "请先根据对话上下文确认本次要处理的 spec 或需求；若上下文不足，请向用户补齐后再推进。"
+  ].join("\n");
+  return wrapHiddenPrompt(guide, original);
+}
+function buildUnknownCommandPrompt(prompt, hit) {
+  const original = prompt.trim();
+  const lines = [
+    "下方用户输入以 `/` 开头，这是 YorZ 输入框的指令语法，**不是**你自身的 slash command，请勿按命令解析、也不要回复 `Unknown command`。"
+  ];
+  if (hit) {
+    lines.push(
+      `\`/${hit.name}\` 是用户在 YorZ 中配置的自定义指令，但未配置隐藏提示词${hit.description ? `；其说明为：${hit.description}` : ""}。请结合该指令名与下方正文理解用户意图。`
+    );
+  } else {
+    lines.push("该指令未在 YorZ 中配置，请忽略指令前缀，按普通文本理解下方正文。");
+  }
+  return wrapHiddenPrompt(lines.join("\n"), original);
+}
+function resolveChatPrompt(prompt, instructions, opts = {}) {
+  const original = prompt.trim();
+  if (!isSlashCommand(original)) return { prompt, builtin: null };
+  if (isYorzDebugCommand(original)) {
+    return { prompt: buildChatDebugPrompt(original, opts.now), builtin: "yorz-debug" };
+  }
+  if (SPEC_COMMAND_RE.test(original)) {
+    return {
+      prompt: buildChatSpecPrompt(original, opts.specsDirRelative ?? ".yorz/specs"),
+      builtin: "yorz-spec"
+    };
+  }
+  const hit = matchCustomInstruction(original, instructions);
+  if (hit?.hiddenPrompt.trim()) {
+    return { prompt: wrapHiddenPrompt(hit.hiddenPrompt, original), builtin: null };
+  }
+  return { prompt: buildUnknownCommandPrompt(original, hit), builtin: null };
+}
+async function loadCustomInstructions(projectPath) {
+  const [project, global] = await Promise.all([
+    loadProjectConfig(projectPath).then((cfg) => cfg.customInstructions).catch(() => []),
+    loadGlobalConfig().then((cfg) => cfg.customInstructions).catch(() => [])
+  ]);
+  return mergeCustomInstructions(project, global);
+}
 const KINDS = ["claude", "codex", "opencode"];
 const DRAFT_ID_RE = /^[a-zA-Z0-9-]{1,64}$/;
 function buildChatPrompt(prompt, draftId, attachments) {
@@ -1616,13 +1906,14 @@ function buildChatPrompt(prompt, draftId, attachments) {
     const rel = `${dir}/${a.storedName}`;
     return a.kind === "image" ? `- ![${a.name}](${rel})` : `- [${a.name}](${rel})`;
   });
-  return [
+  return appendHiddenPrompt(
     prompt,
-    "",
-    "---",
-    `本次消息附带 ${attachments.length} 个附件，已保存在临时目录 \`${dir}/\`（请按需用文件工具直接读取，无需迁移）：`,
-    ...lines
-  ].join("\n");
+    [
+      "---",
+      `本次消息附带 ${attachments.length} 个附件，已保存在临时目录 \`${dir}/\`（请按需用文件工具直接读取，无需迁移）：`,
+      ...lines
+    ].join("\n")
+  );
 }
 function createSessionsRoutes(resolveProject) {
   const app = new Hono();
@@ -1638,6 +1929,11 @@ function createSessionsRoutes(resolveProject) {
     if (p instanceof Response) return p;
     return c.json(await p.sessions.listSessions());
   });
+  app.get("/projects/:projectId/agent-usage", async (c) => {
+    const p = await need(c);
+    if (p instanceof Response) return p;
+    return c.json(await p.sessions.getUsageStatus());
+  });
   app.post("/projects/:projectId/sessions", async (c) => {
     const p = await need(c);
     if (p instanceof Response) return p;
@@ -1689,7 +1985,11 @@ function createSessionsRoutes(resolveProject) {
     }
     const prompt = typeof body.prompt === "string" ? body.prompt.trim() : "";
     if (!prompt) return c.json({ error: "prompt required" }, 400);
-    let finalPrompt = isYorzDebugCommand(prompt) ? buildChatDebugPrompt(prompt) : prompt;
+    const instructions = isSlashCommand(prompt) ? await loadCustomInstructions(p.path) : [];
+    const resolved = resolveChatPrompt(prompt, instructions, {
+      specsDirRelative: p.specsDirRelative
+    });
+    let finalPrompt = resolved.prompt;
     if (body.draftId !== void 0) {
       if (typeof body.draftId !== "string" || !DRAFT_ID_RE.test(body.draftId)) {
         return c.json({ error: "draftId has invalid format" }, 400);
@@ -1700,9 +2000,9 @@ function createSessionsRoutes(resolveProject) {
         finalPrompt = buildChatPrompt(finalPrompt, draftId, metas);
       }
     }
-    if (isYorzDebugCommand(prompt)) void cleanupExpiredChatDebugFiles(p.path).catch(() => {
+    if (resolved.builtin === "yorz-debug") void cleanupExpiredChatDebugFiles(p.path).catch(() => {
     });
-    const handle = await p.sessions.send(c.req.param("sid"), finalPrompt);
+    const handle = await p.sessions.send(c.req.param("sid"), finalPrompt, prompt);
     return c.json({ runId: handle.runId, sessionId: handle.sessionId }, 202);
   });
   app.post("/projects/:projectId/sessions/:sid/abort", async (c) => {
@@ -1713,13 +2013,13 @@ function createSessionsRoutes(resolveProject) {
   });
   return app;
 }
-const execFileP$1 = promisify(execFile);
+const execFileP$2 = promisify(execFile);
 function withHiddenWindowsConsole(options, platform2 = process.platform) {
   if (platform2 !== "win32") return options;
   return { ...options, windowsHide: true };
 }
 async function execFileWithoutWindow(file, args, options) {
-  const result = await execFileP$1(file, args, withHiddenWindowsConsole(options));
+  const result = await execFileP$2(file, args, withHiddenWindowsConsole(options));
   return { stdout: result.stdout, stderr: result.stderr };
 }
 function spawnWithoutWindow(command, args, options) {
@@ -1876,7 +2176,7 @@ async function commit(cwd, opts) {
   const extraPaths = renamed.map((r) => r.renamedFrom);
   const allPaths = [...opts.paths, ...extraPaths];
   await runGit(cwd, ["add", "--", ...allPaths]);
-  await runGit(cwd, ["commit", "-m", message, "--", ...allPaths]);
+  await runGit(cwd, ["commit", "-m", message]);
   const { stdout } = await runGit(cwd, ["rev-parse", "HEAD"]);
   return { commit: stdout.trim() };
 }
@@ -2451,111 +2751,6 @@ function createProjectRoutes(registry, worktreeManager) {
   });
   return app;
 }
-const CURRENT_VERSION = 1;
-const DEFAULT_SPECS_DIR = ".yorz/specs";
-function defaultProjectConfig() {
-  return {
-    version: CURRENT_VERSION,
-    agent: { kind: "inherit" },
-    specsDir: DEFAULT_SPECS_DIR,
-    commands: []
-  };
-}
-function configPath(cwd) {
-  return join(cwd, ".yorz", "config.json");
-}
-async function loadProjectConfig(cwd) {
-  const fp = configPath(cwd);
-  if (!existsSync(fp)) return defaultProjectConfig();
-  let raw;
-  try {
-    raw = await readFile(fp, "utf8");
-  } catch {
-    return defaultProjectConfig();
-  }
-  if (!raw.trim()) return defaultProjectConfig();
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    return defaultProjectConfig();
-  }
-  return normalizeConfig(parsed);
-}
-async function saveProjectConfig(cwd, cfg) {
-  const fp = configPath(cwd);
-  await mkdir(dirname(fp), { recursive: true });
-  const normalized = normalizeConfig(cfg);
-  const body = `${JSON.stringify(normalized, null, 2)}
-`;
-  const tmp = `${fp}.tmp-${process.pid}-${Date.now().toString(36)}`;
-  await writeFile(tmp, body, "utf8");
-  await rename(tmp, fp);
-}
-function resolveSpecsDir(cwd, cfg) {
-  const root = resolve(cwd);
-  const raw = (cfg.specsDir || DEFAULT_SPECS_DIR).trim() || DEFAULT_SPECS_DIR;
-  const abs = isAbsolute(raw) ? resolve(raw) : resolve(root, raw);
-  const rel = relative(root, abs);
-  if (rel === "" || rel.startsWith("..") || isAbsolute(rel)) {
-    throw new Error(`specsDir must stay within the project root: ${raw}`);
-  }
-  return abs;
-}
-async function ensureSpecsDirExists(absSpecsDir) {
-  await mkdir(absSpecsDir, { recursive: true });
-}
-function normalizeConfig(value) {
-  if (!value || typeof value !== "object") return defaultProjectConfig();
-  const obj = value;
-  const agent = normalizeAgent(obj.agent);
-  const specsDir = normalizeSpecsDir(obj.specsDir);
-  const commands = normalizeCommands(obj.commands);
-  return { version: CURRENT_VERSION, agent, specsDir, commands };
-}
-function normalizeCommands(value) {
-  if (!Array.isArray(value)) return [];
-  const out = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const item of value) {
-    if (!item || typeof item !== "object") continue;
-    const obj = item;
-    const id = typeof obj.id === "string" ? obj.id.trim() : "";
-    const name2 = typeof obj.name === "string" ? obj.name.trim() : "";
-    const cli = typeof obj.cli === "string" ? obj.cli.trim() : "";
-    if (!id || !name2 || !cli || seen.has(id)) continue;
-    seen.add(id);
-    const createdAt = typeof obj.createdAt === "number" && obj.createdAt > 0 ? obj.createdAt : 0;
-    out.push({ id, name: name2, cli, createdAt });
-  }
-  return out;
-}
-function normalizeAgent(value) {
-  if (typeof value === "string") {
-    if (value === "opencode") return { kind: "opencode" };
-    if (value === "codex") return { kind: "codex" };
-    return { kind: "claude" };
-  }
-  if (!value || typeof value !== "object") return { kind: "claude" };
-  const obj = value;
-  const kind = obj.kind;
-  if (kind === "inherit") return { kind: "inherit" };
-  if (kind === "opencode") return { kind: "opencode" };
-  if (kind === "codex") return { kind: "codex" };
-  if (kind === "custom") {
-    const cmd = typeof obj.cmd === "string" ? obj.cmd.trim() : "";
-    if (!cmd) return { kind: "claude" };
-    const args = Array.isArray(obj.args) ? obj.args.filter((a) => typeof a === "string") : [];
-    return { kind: "custom", cmd, args };
-  }
-  return { kind: "claude" };
-}
-function normalizeSpecsDir(value) {
-  if (typeof value !== "string") return DEFAULT_SPECS_DIR;
-  const trimmed = value.trim();
-  if (!trimmed) return DEFAULT_SPECS_DIR;
-  return trimmed;
-}
 function createProjectConfigRoutes(registry) {
   const app = new Hono();
   app.get("/projects/:projectId/config", async (c) => {
@@ -2582,7 +2777,8 @@ function createProjectConfigRoutes(registry) {
       version: 1,
       agent: parsed.agent,
       specsDir: parsed.specsDir,
-      commands: current.commands
+      commands: current.commands,
+      customInstructions: current.customInstructions
     };
     let absSpecsDir;
     try {
@@ -2603,6 +2799,34 @@ function createProjectConfigRoutes(registry) {
     await registry.reload(id);
     return c.json({ ok: true, config: cfg });
   });
+  app.get("/projects/:projectId/custom-instructions", async (c) => {
+    const id = c.req.param("projectId");
+    const entry = await registry.findEntry(id);
+    if (!entry) return c.json({ error: "project not found" }, 404);
+    const cfg = await loadProjectConfig(entry.path);
+    return c.json({ customInstructions: cfg.customInstructions });
+  });
+  app.put("/projects/:projectId/custom-instructions", async (c) => {
+    const id = c.req.param("projectId");
+    const entry = await registry.findEntry(id);
+    if (!entry) return c.json({ error: "project not found" }, 404);
+    let raw;
+    try {
+      raw = await c.req.json();
+    } catch {
+      return c.json({ error: "invalid JSON body" }, 400);
+    }
+    if (!raw || typeof raw !== "object") return c.json({ error: "body must be an object" }, 400);
+    const parsed = parseCustomInstructions(raw.customInstructions);
+    if ("error" in parsed) return c.json({ error: parsed.error }, 400);
+    const current = await loadProjectConfig(entry.path);
+    try {
+      await saveProjectConfig(entry.path, { ...current, customInstructions: parsed });
+    } catch (err) {
+      return c.json({ error: err.message }, 500);
+    }
+    return c.json({ ok: true, customInstructions: parsed });
+  });
   return app;
 }
 function parseBody$1(value) {
@@ -2802,7 +3026,9 @@ function createGlobalConfigRoutes(globalConfigPath, powerController = getPowerIn
       agent: cfg.agent,
       notifications: cfg.notifications,
       shortcuts: cfg.shortcuts,
-      power: cfg.power
+      power: cfg.power,
+      appearance: cfg.appearance,
+      customInstructions: cfg.customInstructions
     });
   });
   app.put("/global-config", async (c) => {
@@ -2819,6 +3045,8 @@ function createGlobalConfigRoutes(globalConfigPath, powerController = getPowerIn
     cfg.notifications = parsed.notifications;
     cfg.shortcuts = parsed.shortcuts;
     cfg.power = parsed.power;
+    cfg.appearance = parsed.appearance;
+    cfg.customInstructions = parsed.customInstructions;
     await saveGlobalConfig(cfg, globalConfigPath);
     await powerController.refresh();
     return c.json({
@@ -2827,7 +3055,9 @@ function createGlobalConfigRoutes(globalConfigPath, powerController = getPowerIn
         agent: cfg.agent,
         notifications: cfg.notifications,
         shortcuts: cfg.shortcuts,
-        power: cfg.power
+        power: cfg.power,
+        appearance: cfg.appearance,
+        customInstructions: cfg.customInstructions
       }
     });
   });
@@ -2887,13 +3117,33 @@ function parseBody(value) {
       error: "power.inhibitWhenRunning must be system-default | prevent-display-sleep | keep-system-awake"
     };
   }
+  const appearance = parseAppearance(obj.appearance ?? DEFAULT_APPEARANCE);
+  if ("error" in appearance) return appearance;
+  const customInstructions = parseCustomInstructions(obj.customInstructions);
+  if ("error" in customInstructions) return customInstructions;
   return {
     agent: { defaultKind },
     notifications: { sessionEnd: { banner: s.banner, sound: s.sound } },
     shortcuts: normalizeShortcuts(shortcutObj),
-    power: { inhibitWhenRunning }
+    power: { inhibitWhenRunning },
+    appearance,
+    customInstructions
   };
 }
+function parseAppearance(value) {
+  if (!value || typeof value !== "object") return { error: "appearance must be an object" };
+  const obj = value;
+  const themeMode = obj.themeMode;
+  if (!isThemeMode(themeMode))
+    return { error: "appearance.themeMode must be system | light | dark" };
+  const themeName = obj.themeName;
+  if (!isThemeName(themeName)) {
+    return { error: "appearance.themeName must be terminal | graphite | paper" };
+  }
+  const language = obj.language;
+  if (!isLanguage(language)) return { error: "appearance.language must be zh-CN | en" };
+  return { themeMode, themeName, language };
+}
 function createSpecDraftsRoutes(resolveProject) {
   const app = new Hono();
   const need = async (c) => {
@@ -4104,7 +4354,7 @@ class RegistryEventBus {
         this.scheduleEmit();
       });
     } catch (err) {
-      registryLog().warn("projects.json watch failed", { dir, message: err.message });
+      registryLog().warn("global config watch failed", { dir, message: err.message });
     }
   }
   stop() {
@@ -5305,6 +5555,37 @@ function toolResultText(content) {
   }
   return content == null ? "" : JSON.stringify(content);
 }
+const USAGE_WINDOWS = [
+  ["five_hour", "5-hour"],
+  ["seven_day", "7-day"],
+  ["seven_day_sonnet", "Sonnet 7-day"],
+  ["seven_day_opus", "Opus 7-day"],
+  ["seven_day_oauth_apps", "OAuth apps 7-day"]
+];
+function usageWindows(usage) {
+  const out = [];
+  const limits = usage.rate_limits;
+  if (!limits) return out;
+  for (const [key, label] of USAGE_WINDOWS) {
+    const win = limits[key];
+    if (!win) continue;
+    out.push({
+      key,
+      label,
+      utilization: typeof win.utilization === "number" ? win.utilization : null,
+      resetsAt: typeof win.resets_at === "string" ? win.resets_at : null
+    });
+  }
+  for (const win of limits.model_scoped ?? []) {
+    out.push({
+      key: `model:${win.display_name}`,
+      label: win.display_name,
+      utilization: typeof win.utilization === "number" ? win.utilization : null,
+      resetsAt: typeof win.resets_at === "string" ? win.resets_at : null
+    });
+  }
+  return out;
+}
 class ClaudeSession {
   constructor(id, cwd, isNew) {
     this.id = id;
@@ -5414,10 +5695,40 @@ class ClaudeAdapter {
     return out;
   }
   capabilities() {
-    return { listSessions: true, getMessages: true };
+    return { listSessions: true, getMessages: true, usageStatus: true };
+  }
+  async getUsageStatus() {
+    const options = {
+      cwd: this.cwd,
+      permissionMode: "bypassPermissions",
+      allowDangerouslySkipPermissions: true
+    };
+    const q = query({ prompt: "", options });
+    try {
+      const usage = await q.usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET();
+      q.close();
+      return {
+        kind: this.kind,
+        status: usage.rate_limits_available ? "available" : "unavailable",
+        checkedAt: Date.now(),
+        subscriptionType: usage.subscription_type,
+        rateLimitsAvailable: usage.rate_limits_available,
+        windows: usageWindows(usage),
+        message: usage.rate_limits_available ? void 0 : "claude usage rate limits are unavailable for this auth/provider"
+      };
+    } catch (err) {
+      q.close();
+      return {
+        kind: this.kind,
+        status: "error",
+        checkedAt: Date.now(),
+        message: err instanceof Error ? err.message : String(err)
+      };
+    }
   }
 }
 const DEFAULT_CODEX_STORAGE_ROOT = join(homedir(), ".codex");
+const CODEX_USAGE_URL = "https://chatgpt.com/backend-api/codex/usage";
 const TITLE_MAX_LENGTH$1 = 64;
 function codexThreadOptions(cwd) {
   return {
@@ -5474,6 +5785,107 @@ function parseCodexSessionIndex(text) {
   }
   return out;
 }
+function asRecord$1(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function numberFrom$1(value) {
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (typeof value === "string" && value.trim()) {
+    const n = Number(value);
+    if (Number.isFinite(n)) return n;
+  }
+  return null;
+}
+function resetFrom$1(value) {
+  if (typeof value === "string" && value.trim()) {
+    const n2 = Number(value);
+    if (Number.isFinite(n2)) return new Date(n2 * 1e3).toISOString();
+    const d = new Date(value);
+    return Number.isFinite(d.getTime()) ? d.toISOString() : null;
+  }
+  const n = numberFrom$1(value);
+  return n == null ? null : new Date(n * 1e3).toISOString();
+}
+function codexWindow(key, label, value) {
+  const rec = asRecord$1(value);
+  if (!rec) return null;
+  const utilization = numberFrom$1(rec.used_percent) ?? numberFrom$1(rec.usedPercent) ?? numberFrom$1(rec.utilization) ?? numberFrom$1(rec.percent_used);
+  if (utilization == null) return null;
+  return {
+    key,
+    label,
+    utilization,
+    resetsAt: resetFrom$1(rec.resets_at ?? rec.reset_at ?? rec.resetsAt ?? rec.resetAt)
+  };
+}
+function parseCodexUsageResponse(raw) {
+  const root = asRecord$1(raw);
+  if (!root) return null;
+  const rateLimit = asRecord$1(root.rate_limit);
+  const rateLimits = asRecord$1(root.rate_limits);
+  const windows = [];
+  const primary = codexWindow(
+    "primary",
+    "Primary",
+    rateLimit?.primary_window ?? rateLimits?.primary ?? root.primary
+  );
+  if (primary) windows.push(primary);
+  const secondary = codexWindow(
+    "secondary",
+    "Secondary",
+    rateLimit?.secondary_window ?? rateLimits?.secondary ?? root.secondary
+  );
+  if (secondary) windows.push(secondary);
+  const additional = root.additional_rate_limits ?? root.additionalRateLimits ?? rateLimit?.additional;
+  if (Array.isArray(additional)) {
+    for (const [idx, item] of additional.entries()) {
+      const rec = asRecord$1(item);
+      const label = String(rec?.label ?? rec?.name ?? rec?.limit_name ?? `Additional ${idx + 1}`);
+      const win = codexWindow(`additional:${idx}`, label, item);
+      if (win) windows.push(win);
+    }
+  }
+  if (windows.length === 0) return null;
+  return {
+    kind: "codex",
+    status: "available",
+    checkedAt: Date.now(),
+    source: "private-api",
+    subscriptionType: typeof root.plan_type === "string" ? root.plan_type : null,
+    rateLimitsAvailable: true,
+    windows
+  };
+}
+function parseCodexTokenCountSnapshot(text) {
+  let latestTs = 0;
+  let latest = null;
+  for (const line of text.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+    let obj;
+    try {
+      obj = JSON.parse(trimmed);
+    } catch {
+      continue;
+    }
+    const rec = asRecord$1(obj);
+    const payload = asRecord$1(rec?.payload);
+    if (payload?.type !== "token_count") continue;
+    const parsed = parseCodexUsageResponse({ rate_limits: payload.rate_limits });
+    if (!parsed) continue;
+    const ts = typeof rec?.timestamp === "string" ? Date.parse(rec.timestamp) : 0;
+    if (ts >= latestTs) {
+      latestTs = ts;
+      latest = {
+        ...parsed,
+        checkedAt: Number.isFinite(ts) && ts > 0 ? ts : Date.now(),
+        source: "local-snapshot",
+        message: "codex local token_count snapshot"
+      };
+    }
+  }
+  return latest;
+}
 class CodexSession {
   constructor(thread) {
     this.thread = thread;
@@ -5597,7 +6009,52 @@ class CodexAdapter {
     return out;
   }
   capabilities() {
-    return { listSessions: true, getMessages: true };
+    return { listSessions: true, getMessages: true, usageStatus: true };
+  }
+  async getUsageStatus() {
+    const live = await this.readPrivateUsage().catch(() => null);
+    if (live) return live;
+    const snapshot = await this.readLatestUsageSnapshot().catch(() => null);
+    if (snapshot) return snapshot;
+    return {
+      kind: this.kind,
+      status: "unavailable",
+      checkedAt: Date.now(),
+      message: "codex usage is unavailable: private API failed and no local token_count snapshot found"
+    };
+  }
+  async readPrivateUsage() {
+    const auth = await this.readAuth();
+    if (!auth) return null;
+    const res = await fetch(CODEX_USAGE_URL, {
+      headers: {
+        authorization: `Bearer ${auth.accessToken}`,
+        "chatgpt-account-id": auth.accountId
+      }
+    });
+    if (!res.ok) return null;
+    return parseCodexUsageResponse(await res.json());
+  }
+  async readAuth() {
+    let raw;
+    try {
+      raw = JSON.parse(await readFile(join(this.storageRoot, "auth.json"), "utf8"));
+    } catch {
+      return null;
+    }
+    const tokens = asRecord$1(asRecord$1(raw)?.tokens);
+    const accessToken = typeof tokens?.access_token === "string" ? tokens.access_token : "";
+    const accountId = typeof tokens?.account_id === "string" ? tokens.account_id : "";
+    return accessToken && accountId ? { accessToken, accountId } : null;
+  }
+  async readLatestUsageSnapshot() {
+    let latest = null;
+    for (const file of await this.walkRollouts()) {
+      const parsed = parseCodexTokenCountSnapshot(await readFile(file, "utf8"));
+      if (!parsed) continue;
+      if (!latest || parsed.checkedAt >= latest.checkedAt) latest = parsed;
+    }
+    return latest;
   }
   async walkRollouts() {
     const out = [];
@@ -5684,6 +6141,137 @@ class CodexAdapter {
     return null;
   }
 }
+const execFileP$1 = promisify(execFile);
+const OPENCODE_QUOTA_INSTALL = "npx @slkiser/opencode-quota@latest init";
+const OPENCODE_QUOTA_PLUGIN_BIN = join(
+  homedir(),
+  ".cache",
+  "opencode",
+  "packages",
+  "@slkiser",
+  "opencode-quota@latest",
+  "node_modules",
+  "@slkiser",
+  "opencode-quota",
+  "dist",
+  "bin",
+  "opencode-quota.js"
+);
+function asRecord(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function numberFrom(value) {
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (typeof value === "string" && value.trim()) {
+    const n = Number(value);
+    if (Number.isFinite(n)) return n;
+  }
+  return null;
+}
+function resetFrom(value) {
+  if (typeof value === "string" && value.trim()) {
+    const n2 = Number(value);
+    if (Number.isFinite(n2)) return new Date(n2 * 1e3).toISOString();
+    const d = new Date(value);
+    return Number.isFinite(d.getTime()) ? d.toISOString() : null;
+  }
+  const n = numberFrom(value);
+  return n == null ? null : new Date(n * 1e3).toISOString();
+}
+function usageWindowFromRecord(rec, idx) {
+  const label = String(rec.label ?? rec.name ?? rec.title ?? rec.provider ?? `Window ${idx + 1}`);
+  const used = numberFrom(rec.usedPercent) ?? numberFrom(rec.used_percent) ?? numberFrom(rec.percent) ?? numberFrom(rec.utilization);
+  const remaining = numberFrom(rec.remainingPercent) ?? numberFrom(rec.remaining_percent) ?? numberFrom(rec.percentRemaining);
+  const utilization = used ?? (remaining == null ? null : 100 - remaining);
+  if (utilization == null) return null;
+  return {
+    key: String(rec.key ?? rec.id ?? label),
+    label,
+    utilization,
+    resetsAt: resetFrom(rec.resetsAt ?? rec.resets_at ?? rec.resetAt ?? rec.reset_at ?? rec.reset)
+  };
+}
+function collectOpencodeQuotaWindows(value, out, seen) {
+  if (!value || seen.has(value)) return;
+  seen.add(value);
+  if (Array.isArray(value)) {
+    for (const item of value) collectOpencodeQuotaWindows(item, out, seen);
+    return;
+  }
+  const rec = asRecord(value);
+  if (!rec) return;
+  const win = usageWindowFromRecord(rec, out.length);
+  if (win) out.push(win);
+  for (const key of ["windows", "quotas", "items", "limits", "entries"]) {
+    if (key in rec) collectOpencodeQuotaWindows(rec[key], out, seen);
+  }
+  for (const key of ["providers", "data"]) {
+    const child = asRecord(rec[key]);
+    if (child) {
+      for (const value2 of Object.values(child)) collectOpencodeQuotaWindows(value2, out, seen);
+    } else if (key in rec) {
+      collectOpencodeQuotaWindows(rec[key], out, seen);
+    }
+  }
+}
+function parseOpencodeQuotaOutput(text) {
+  let raw;
+  try {
+    raw = JSON.parse(text);
+  } catch {
+    return parseOpencodeQuotaText(text);
+  }
+  const windows = [];
+  collectOpencodeQuotaWindows(raw, windows, /* @__PURE__ */ new Set());
+  if (windows.length === 0) return null;
+  return {
+    kind: "opencode",
+    status: "available",
+    checkedAt: Date.now(),
+    source: "external-cli",
+    rateLimitsAvailable: true,
+    windows
+  };
+}
+function parseOpencodeQuotaText(text) {
+  const windows = [];
+  let provider = "";
+  for (const line of text.split("\n")) {
+    const providerMatch = line.match(/^\s*→\s*\[(.+?)]/);
+    if (providerMatch) {
+      provider = providerMatch[1].trim();
+      continue;
+    }
+    const quotaMatch = line.match(/^\s*(.+?quota)\s+.*?(\d+(?:\.\d+)?)%\s+left/i);
+    if (!quotaMatch) continue;
+    const label = [provider, quotaMatch[1].trim()].filter(Boolean).join(": ");
+    const remaining = Number(quotaMatch[2]);
+    windows.push({
+      key: label || `quota:${windows.length}`,
+      label: label || `Quota ${windows.length + 1}`,
+      utilization: Math.max(0, Math.min(100, 100 - remaining)),
+      resetsAt: null
+    });
+  }
+  if (windows.length === 0) return null;
+  return {
+    kind: "opencode",
+    status: "available",
+    checkedAt: Date.now(),
+    source: "external-cli",
+    rateLimitsAvailable: true,
+    windows
+  };
+}
+async function opencodeQuotaCommands() {
+  const commands = [{ cmd: "opencode-quota", args: ["show", "--json"] }];
+  try {
+    await access(OPENCODE_QUOTA_PLUGIN_BIN);
+    commands.push({ cmd: process.execPath, args: [OPENCODE_QUOTA_PLUGIN_BIN, "show", "--json"] });
+  } catch {
+  }
+  return commands;
+}
 function textParts(parts) {
   const out = [];
   for (const p of parts) {
@@ -5713,7 +6301,9 @@ class OpenCodeSession {
       if (this.aborted) return;
       const data = res.data;
       if (!data) {
-        const errMsg = res.error && typeof res.error === "object" && "data" in res.error ? String(res.error.data?.message ?? "prompt failed") : "prompt failed";
+        const errMsg = res.error && typeof res.error === "object" && "data" in res.error ? String(
+          res.error.data?.message ?? "prompt failed"
+        ) : "prompt failed";
         yield { type: "error", message: errMsg };
         return;
       }
@@ -5795,7 +6385,51 @@ class OpenCodeAdapter {
     return out;
   }
   capabilities() {
-    return { listSessions: true, getMessages: true };
+    return { listSessions: true, getMessages: true, usageStatus: true };
+  }
+  async getUsageStatus() {
+    let lastError;
+    for (const command of await opencodeQuotaCommands()) {
+      try {
+        const { stdout } = await execFileP$1(command.cmd, command.args, {
+          cwd: this.cwd,
+          timeout: 1e4,
+          maxBuffer: 1024 * 1024
+        });
+        const parsed = parseOpencodeQuotaOutput(stdout);
+        if (parsed) return parsed;
+        return {
+          kind: this.kind,
+          status: "error",
+          checkedAt: Date.now(),
+          source: "external-cli",
+          message: "opencode-quota returned no parseable quota windows"
+        };
+      } catch (err2) {
+        lastError = err2;
+        if (err2.code === "ENOENT") continue;
+        break;
+      }
+    }
+    const err = lastError;
+    const code = err?.code;
+    if (code === "ENOENT") {
+      return {
+        kind: this.kind,
+        status: "unavailable",
+        checkedAt: Date.now(),
+        source: "external-cli",
+        installCommand: OPENCODE_QUOTA_INSTALL,
+        message: "opencode-quota is not installed"
+      };
+    }
+    return {
+      kind: this.kind,
+      status: "error",
+      checkedAt: Date.now(),
+      source: "external-cli",
+      message: err instanceof Error ? err.message : String(err)
+    };
   }
   async dispose() {
     if (!this.booting) return;
@@ -5937,14 +6571,17 @@ class SessionManager {
           const indexed2 = byId.get(info.id);
           if (!indexed2) {
             byId.set(info.id, info);
-          } else if (isOpaqueTitle(indexed2.title, indexed2.id) && !isOpaqueTitle(info.title, info.id)) {
-            byId.set(info.id, {
-              ...indexed2,
-              title: info.title,
-              createdAt: Math.min(indexed2.createdAt, info.createdAt),
-              updatedAt: Math.max(indexed2.updatedAt, info.updatedAt)
-            });
+            continue;
+          }
+          const merged = {
+            ...indexed2,
+            createdAt: Math.min(indexed2.createdAt, info.createdAt),
+            updatedAt: Math.max(indexed2.updatedAt, info.updatedAt)
+          };
+          if (isOpaqueTitle(indexed2.title, indexed2.id) && !isOpaqueTitle(info.title, info.id)) {
+            merged.title = info.title;
           }
+          byId.set(info.id, merged);
         }
       } catch {
       }
@@ -5952,8 +6589,11 @@ class SessionManager {
     const alive = [...byId.values()].filter(
       (s) => nativeIds.has(s.id) || s.createdAt !== s.updatedAt || this.running.has(s.id)
     );
+    const activityRank = (s) => this.running.has(s.id) ? 1 : 0;
     const out = [];
-    for (const s of alive.sort((a, b) => b.updatedAt - a.updatedAt)) {
+    for (const s of alive.sort(
+      (a, b) => activityRank(b) - activityRank(a) || b.updatedAt - a.updatedAt
+    )) {
       out.push({ ...s, running: this.running.has(s.id) });
       if (out.length >= SESSION_LIST_LIMIT) break;
     }
@@ -6001,6 +6641,27 @@ class SessionManager {
     if (!adapter.capabilities().getMessages) return [];
     return adapter.getMessages(sid);
   }
+  async getUsageStatus() {
+    const adapter = this.adapters.get(this.defaultKind);
+    if (!adapter.capabilities().usageStatus || !adapter.getUsageStatus) {
+      return {
+        kind: this.defaultKind,
+        status: "unavailable",
+        checkedAt: Date.now(),
+        message: `${this.defaultKind} adapter does not support usage status queries`
+      };
+    }
+    try {
+      return await adapter.getUsageStatus();
+    } catch (err) {
+      return {
+        kind: this.defaultKind,
+        status: "error",
+        checkedAt: Date.now(),
+        message: err instanceof Error ? err.message : String(err)
+      };
+    }
+  }
   async ensureLive(sid) {
     const existing = this.live.get(sid);
     if (existing) return existing;
@@ -6012,12 +6673,19 @@ class SessionManager {
     if (this.disposing) session.abort();
     return ls;
   }
-  async send(sid, prompt) {
+  /**
+   * `titleSource` lets callers derive the session title from the user's own
+   * text while sending an expanded prompt to the Agent. Without it, an injected
+   * hidden prompt would become the title.
+   */
+  async send(sid, prompt, titleSource) {
     const runId = randomUUID();
     const emitter = this.emitterFor(sid);
     let currentSid = sid;
     const startedAt = Date.now();
-    await this.maybeUpdateTitleFromPrompt(currentSid, prompt).catch(() => {
+    await this.maybeUpdateTitleFromPrompt(currentSid, titleSource ?? prompt).catch(() => {
+    });
+    await this.store.touch(sid).catch(() => {
     });
     this.setRunning(sid, true);
     agentLog().info("dispatch start", { sessionId: sid, runId, promptLength: prompt.length });